auto merge of #220 : erickt/cargo/master, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 18 Jul 2014 15:32:10 +0000 (15:32 +0000)
committerbors <bors@rust-lang.org>
Fri, 18 Jul 2014 15:32:10 +0000 (15:32 +0000)
commit65ff8ada78ba5c4c5ed65a3d6e3287ccb5e59fb1
tree1bfaa1e949af39cec87f05a3c5cce3a77fe4e9a9
parent0d2dfd75a65ddba1a706bb148b7547a7b3b57a51
parentf109d0b80d2819a552166d32983598cb198dc8cc
auto merge of #220 : erickt/cargo/master, r=alexcrichton

Please don't land this until https://github.com/wycats/hammer.rs/pull/12 is landed, or else it will break the build.